From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 19 Sep 2002 18:57:48 +0000 (+0000)
Subject: (custom-make-dependencies): Fix previous change.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~30499
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=93ba910f0d6f0fa461079bc7dd13b6fa90192cfd;p=emacs.git

(custom-make-dependencies): Fix previous change.
---

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 9156bcec3bf..a73569203ab 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -87,7 +87,17 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
 		    item where found)
 		(when members
 		  ;; So x and no-x builds won't differ.
-		  (setq members (sort (copy-sequence members) 'string<))
+		  (setq members
+			(sort (copy-sequence members) 
+			      (lambda (x y)
+				(cond ((and (stringp x) (stringp y))
+				       (string< x y))
+				      ;; Put all non-strings before strings.
+				      ((stringp y) t)
+				      ((stringp x) nil)
+				      ;; For two non-strings,
+				      ;; use the order they appear in MEMBERS.
+				      (t (member y (member x members)))))))
 		  (while members
 		    (setq item (car (car members))
 			  members (cdr members)